ntlord Merge pull request #2 from simonjhogan/patch-1