fix issue #8
fixed issue #5
Merge pull request #12 from marti1125/gh-pages

fix issue #8