Merge pull request #129 from Jon889/master

Fixes #128
Merge pull request #131 from Jon889/master

Fixes #130
Update README.md
Fixed typo for showing cd number
Merge remote-tracking branch 'upstream/master'