Fix #114
Fix #113
Merge branch 'master' of https://github.com/slipstream/SlipStreamUI