Merge pull request #502 from vsrinivas/master