Merge pull request #1 from thinkaurelius/titan05

Titan05
Merge pull request #2 from thinkaurelius/titan05

Titan05
Merge pull request #3 from thinkaurelius/titan05

Titan05
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05
Merge branch 'titan05' of git.eefung.com:thinkaurelius/titan into titan05