Merge pull request #188 from RoyChaudhuri/master