Linux Build Fix + Code Cleanup
Merge pull request #195 from avinashcpandey/develop

Linux Build Fix + Code Cleanup