Merge pull request #96 from sriprasanna/master

Fixing broken build