Refactoring
Merge pull request #7 from tobiassjosten/smallfixes

Refactoring