tried new stuff

nuff said
Merge branch 'master' of https://github.com/TLaugel/Locomotive