Fixed some problems
Merge branch 'master' of github.com:neubig/travatar