bugfix #s: 11,12,39,40
Merge origin/master