Fix for Issue #5.
Merge branch 'master' into develop2
Merge branch 'master' into develop2