Merge pull request #2 from moliri/gh-pages

updating dev to latest
Merge pull request #3 from moliri/dev

Merge pull request #2 from moliri/gh-pages