[BUGFIX] for major bug in version 1.1.13
Merge branch 'development'
Merge branch 'master' into development