Fixes issue #10 + some clean-up & brush-up, added sponsors.