fixing places
Merge branch 'hotfix/v.2015.0.3'