commit
Merge pull request #10 from Zarph/master

ds