Fixed build issues
Merge pull request #1 from anujsrc/master

Fixed build issues