Merge branch 'develop'
Merge branch 'develop'
Fixed setup.py to be able to find the subpackages on the pythonpath
Up version for hotfix
Merge branch 'master' into develop