Merge branch 'hotfix-tsp'
Merge branch 'develop'
class is now compatible with new package structure
Merge branch 'master' into develop