Merge branch 'release/1.0.6' into develop
Changed namespace because of composer problems
Bumped version to 1.0.7
Merge branch 'release/1.0.7'