Merge pull request #2 from paeder/master

merging master with develop