Fix modal screen out (refs #16)
Merge branch 'issue#16' into develop (fixed #16)