refactoring so I can merge
Merge branch 'master'
Added some unit test framework
Merge commit