issue #844
Merge branch 'develop' of github.com:osclass/Osclass into develop