Some comilation fixes
Merge pull request #155 from avinashcpandey/develop

Some comilation fixes