readability
bugfixing + new tests
Merge branch 'dev'