Updating to actual state.
such fix
Merge branch 'master' into gh-pages