Merge pull request #1 from fredcallaway/master

Update to include changes to master.