#6 #7 #8 little refactoring
Merge remote-tracking branch 'origin/develop' into develop