Merge branch 'develop'
tag and setup for distutils
version number slipped through
Merge branch 'develop'