Merge pull request #17 from kobliha/master

New version to match the changes file