Update README.markdown
Merge remote-tracking branch 'origin/master' into grunt04