Refactoring and bugfixing
Merge pull request #22 from mkalb/refactor

Refactoring and bugfixing