refactorings
added more tests
increased version number