Merge pull request #25 from kaushiksanthanam/master