Merge pull request #8 from pixelmack/master

Added changes from master to gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/pixelmack/slight