Merge remote-tracking branch 'origin/develop'
Increased readability
Test extension