Merge branch 'gh-pages' into dev

general development branch in 0.2.0 condition station.