Refactored start
Merge remote branch 'cluster/master'