bugfix #6
Merge remote-tracking branch 'origin/1.1.2-wip'
1.1.2 release