Merge pull request #20 from maikelsteneker/master

Fixed NullPointerException.
Fixed constructor.
Merge branch 'master' of https://github.com/kokx/tue-2io23.git