bug fixes - 01
Merge branch 'master' into child1
slight changes after merge