fix / refactoring
Merge branch 'develop'