refactoring
fix in favor of 90efe6b
Merge branch 'develop'