Semantic work & shit
Merge branch 'master' of https://github.com/DRM-TM/Dream