fixes & refactorings
Merge pull request #31 from egoholic/refactoring

fixes & refactorings