Update
Merge pull request #20 from nbellowe/master

Update