cleaned up code
Merge branch 'v1.2.3' into develop
Merge branch 'develop'