Merge pull request #9 from m4ttclendenen/master

from master to tmp
Merge pull request #10 from m4ttclendenen/tmp

Merge pull request #9 from m4ttclendenen/master