Merge pull request #20 from dcsimons/master

The update master