Fixing #17 in a better way

I followed Dean's advice and removed the use of pimpl.