Merge pull request #1 from harwooja/master

Updating my branch with Master Branch - Trial 1
added windows compatibility
Merge pull request #2 from harwooja/Anagh

Added windows compatibility