architecture upgrade
Merge pull request #2 from mhor/code_covergage

architecture upgrade + code coverage
fix #1