Merge pull request #372 from sragavan/master