Merge pull request #2 from paeder/master

merging master with develop
Merge pull request #3 from paeder/develop

Merge pull request #2 from paeder/master