perhaps fix issue 414
working on issue414
Merge branch 'issue414' into develop
Merge branch 'develop' into issue413