Merge pull request #3 from b79789/master

merge 2 to gh-pages