Merge pull request #173 from tssavita/master