Commit from Andrew McConachie
Merge pull request #140 from smutt/master

Chunk from Andrew McConachie