refactored so we got a nice ctor
Merge branch 'develop' of github.com:luukholleman/ASRSJava into develop