Merge branch 'develop'
removes unnecessary example code
Merge branch 'master' into develop