New version
Merge pull request #40 from kobliha/master

New version (needed for package submission)