New header and fixes #9
Removing this crap, dammit flickr