Merge pull request #9 from m4ttclendenen/master

from master to tmp