Merge pull request #186 from tssavita/master