Do be evil
Merge pull request #18 from tetrachloride/3rd-party-branch

Do be evil

Reviewed-by: Vagabond