Refactored and added list of titles
Merge branch 'master' of https://github.com/mattdavben/avarus