Merge branch 'beta'
Deleted example classes
Merge branch 'master' into beta