Merge pull request #1 from mazzarb1/master

Pull
Merge pull request #2 from mazzarb1/gh-pages

Merge pull request #1 from mazzarb1/master