Fixes #15
Merge branch 'master' of github.com:Melindrea/mariehogebrandt-se