Merge pull request #4 from riknos314/master

updating to master
Merge pull request #5 from riknos314/gh-pages

Merge pull request #4 from riknos314/master