first commit with not tested code
fixes, unit tests
remove config
Merge origin/master