Bug fixes for v1.2.6
Merge pull request #36 from terrymun/gh-pages

Syncing gh-pages to master
Merge pull request #37 from terrymun/master

Updating gh-pages with master