add badges
architecture enhancements / unit tests
Merge pull request #8 from mhor/architecture_enhancement

Architecture enhancement