fixed bug
Merge branch 'master' into topic
applied bug fixes on master