Merge pull request #49 from Itxaka/develop

several fixes
update files for pypi bugfix release, add pipy badge, change version number for PEP386
Merge pull request #50 from Itxaka/6.1

6.1