Added stuff
latest and greatest
Merge branch 'master' of https://github.com/thalseth/spacenubs