Bug fixes
Merge branch 'mwork'
Merge remote-tracking branch 'origin/lwork'
Fixed presentation
Merge branch 'master' into mwork