Merge pull request #483 from deepak-srivastava/mastro