Commit for submission
Merge pull request #10 from wadse/master

Commit for submission