user interface improved
Merge branch 'master' into gh-pages

User interface improved