refactored | make it run | fixing bugs

fixes #8
Merge pull request #20 from lc-petranussdorfer/issue/#8

refactored | make it run | fixing bugs