Fix issue #135.
Merge branch 'master' into ui
Merge branch 'ui' of https://github.com/SharUTC/SharUTC into ui