simplified the code base
Merge pull request #2 from LinusU/patch-1

simplified the code base