Merge pull request #1 from kvonflotow/master

catchup
Merge pull request #2 from kvonflotow/dev

Merge pull request #1 from kvonflotow/master