Merge pull request #530 from mpritham/master