working on #102
fix #103
fix #104
fix #105
Merge branch 'master' of https://github.com/BraveUX/website