clean up, code coverage, makefile and all
Merge pull request #1 from avetisk/master

clean up, code coverage, makefile and all