use correct project name
merge
refactored unit tests, better docs