Merge pull request #1 from kvonflotow/master

catchup