signed off by Draxcer <richard"rdiaz.net> 09/21/14
Merge branch 'master' of https://github.com/Draxcer/DiazRichard_CSC11_48598