fixes #80 and fixes #81
Merge branch 'master' of https://github.com/NatLibFi/Skosmos