Should fix #8
Merge branch 'master' of github.com:wacky-tracky/wacky-tracky-web