General changes and stuff.
Merge branch 'master' of https://github.com/darkhax/OSIRIS