Added classes
Merge branch 'master' into Feature#134