Code improved.
Merge branch 'master' of https://github.com/jd78/ArchitectureTemplate.git