Some small changes
Merge branch 'master' into marc
Magic?
MAGIC???
Merge branch 'master' of https://github.com/Mbarrowclift/diCe