fixed the stuff you wanted
Merge branch 'master' of https://github.com/nriss/astro