Resolves #234
Merge branch 'master' of https://github.com/uonline/uonline