Jimmy update
Merge branch 'master' of https://github.com/hoshi89/Forgotten