richfitz Merge pull request #26 from tverbeke/patch-1