Test commit (broken)
Fix crash on startup and crash on button click
Merge pull request #5 from rightfold/Johan

Johan
Merge remote-tracking branch 'origin/master' into GWigWam