Refactoring
Merge pull request #506 from naturwerk/flogy

Refactoring
redo
redo