Merge branch 'master' of https://github.com/weareytm/Ragnarok
Merge branch 'master' of https://github.com/weareytm/Ragnarok