Refactor and Bugfix
Merge pull request #97 from mkalb/refactor

Refactor and Bugfix