WIP
Merge branch 'develop' of github.com:namioka/layered-architecture-1 into develop