Modified license explanation
Merge remote-tracking branch 'origin/develop' into develop
Fix bugs
Merge remote-tracking branch 'origin/develop' into develop