Merge pull request #5 from mlhim/master

reconciliation
Added Windows instructions to README.
Merge pull request #6 from mlhim/1.0

1.0