fixed unicode issue thanks @GregJurman
moving thigns around
Merge branch 'gh-pages' into develop