Test some things (Exceptions etc.)
Merge remote-tracking branch 'origin/master'