Update and rename readme.markdown to readme.md
Merge branch 'master' into windows