Merge pull request #2 from adamkovics/titan_testing

Titan testing
Merge branch 'master' into titan_testing