Make important updates
Also fix bug introduced by the bearded one himself
Merge pull request #4 from jdennes/ohne-bart

Important updates