fixed issue
Merge branch 'master' into gh-pages: fixed issue