cleanup
updated install instructions
Merge branch 'master' into windows