Merge pull request #1 from E-Mobility/local-build