Merged with Loc (again? :S).
Merge branch 'master' of git://github.com/maikelsteneker/tue-2io23