Fixes
Merge branch 'master' of https://github.com/dex3r/Explicatio