SDK Update

New features + bugfixes
Merge branch 'master' into develop