Merge pull request #5 from jnjeG/branch4

Branch4
b511

b511
Merge remote-tracking branch 'origin/b511'
Merge remote-tracking branch 'origin/branch2'
Merge branch 'master' of https://github.com/jnjeG/Taxi