Merge pull request #5 from sampaisley/master

fiddled
Merge pull request #6 from sampaisley/master

Master
Merge pull request #7 from sampaisley/master

Master
Merge pull request #8 from sampaisley/gh-pages

bongoed