Merge pull request #57 from jatinpapreja/master

Fixed windows compatibility issues and some minor errors

Author: kartikay-bagla