Rutger's changes
Update readme
Merge pull request #1 from vallis/master

Incorporated (and tweaked) your features