Merge pull request #9 from danielfoord/master

Master
fixed readme
Merge pull request #10 from danielfoord/dev

merge dev into master