testing
fix for #21
merge hotfix
rewired internals for easier code management and testing
[fix] wrong accessiblity
typo
removed unused code