All points request. Fixes #34
Merge branch 'master' of https://github.com/andreasellervee/EMMtarkvaraprojekt