Issue 04
Merge branch 'master' of https://github.com/adregan/TYO_MAG