Merge pull request #1 from stefanweck/master

1