Fixes #565
Merge branch 'titan05' of https://github.com/thinkaurelius/titan into titan05