Make it more DRY
Merge branch 'master' of github.com:openskye/openskye