fixed issue #18
Merge branch 'gh-pages'