Merge pull request #1 from jantje/master

Merge pull request #198 from henols/master
Correcting bug introduced that didn't replace env variables.
Merge branch 'master' of https://github.com/henols/arduino-eclipse-plugin
Merge pull request #199 from henols/master

Correcting bug introduced that didn't replace env variables.