WIP
Merge branch 'master' of https://github.com/hidori/Mjollnir.git