Merge pull request #1 from eichelkrauta/master

Test Pull Request
Merge remote-tracking branch 'upstream/master'