clean up code
merge commits
Merge branch 'master' into dibel-develop