Fix issue #136.
Merge branch 'master' into ui