Merge branch 'issue7' into dev_1.0
Merge branch 'dev_1.0' into issue7
Commit before merge