Fixing broken build
Merge pull request #98 from san8888/master

Fixing broken build
Merge remote-tracking branch 'upstream/master'