Fix #26 + some modifications regarding mention #13 and similar
Merge branch 'master' of http://github.com/stianwe/PedalTanks