Merge pull request #1 from phikal/master

General fixes and improvements
changed "-a" to "-r" under **How to use:**
Merge branch 'pr/1'
Merge branch 'master' into pr/1