Update from upstream (small fixes)
Merge branch 'master' of https://github.com/xmd5a2/UniRS