Merge branch 'master' of https://github.com/coastalmacs/spotto.git