Kerrins stuff
Merge pull request #30 from swndr/master

Kerrins stuff