Merge pull request #1 from schoeberl/master