Merge pull request #16 from himedlooff/gh-pages

Major refactoring in an effort to make this more reusable