As a matter of fact - I fucked his brains out. Fixes #25.