Format changes
Changed version
Updated license
Merge branch 'master' into testing
typo
Better explanation
Fixed conflict