Lot of testing
Merge pull request #32 from florisverburg/feature_testing

Lot of testing