Merge branch 'development'
Merge branch 'master'
setup.py
Merge branch 'development' into stoewer