Merge pull request #45 from jon0638/master

Update