fixes #55
Merge branch '#5-uiSecurity'