Merge branch 'master' of https://github.com/cgray5/Titan.git