Better routes
Merge pull request #4 from PirosB3/mine

Second pull request from Daniel