Merge branch 'master' into develop
before merging origin/master
fixed some bugs and more signals are now available
reserved some functions and framework for further developing
Merge branch 'develop'