Merge pull request #4 from LinusU/patch-3

test: improvements
lib: refactoring