Merge pull request #31 from marschap/next

preparation for next release
Release 0.61