Merge pull request #2 from feroshjacob/master

Merge this too
Merge pull request #3 from feroshjacob/removing-unix-dependency

Merge pull request #2 from feroshjacob/master