Merge branch 'development'
Some updates & debug code
Merge branch 'master' into development