Refactoring
Merge pull request #1 from pliersch/develop

Refactoring