Update

Merge pull request #44 from jon0638/master