Fixed https://github.com/BrynCooke/totorom/issues/5
Fixed https://github.com/BrynCooke/totorom/issues/6
Merge branch 'master' of git@github.com:BrynCooke/totorom.git