Merge branch 'release/v1.0.0'
Merge branch 'master' of https://github.com/cyberlis/pploader
Merge branch 'master' into develop