improvements
Merge branch 'testing' of github.com:osclass/Osclass into testing