Merge branch 'release/0.11.2' into develop
bumped version number in setup.py
bumping version number in setup.py

Merge branch 'develop'