Fix #19
Merge remote-tracking branch 'origin/master' into Test-UI-bootstrap