conflict resolve
Merge branch 'eznzel-work' into gh-pages