Merge pull request #2 from geow-org/master

Merge
Refactorings
Merge pull request #9 from janschultecom/master

Refactorings & Fix test cases