Added some more really nice classes
Merge remote-tracking branch 'origin/master'
Added some more really nice functionality