Merge pull request #52 from jacquerie/master

Add credit to Matthew McNulty