Add titanium to dependencies
Fix typo in comments
Merge branch 'feature/titan' into develop