Merge branch 'master' into develop
minimalizing Thread object
workaround for #34
Merge branch 'develop'