just updating:
Merge branch 'master' of https://github.com/petryjc/Ascension
touch up stuff i guess