Merge branch 'master' of https://github.com/vanmeule/locimotive.git