Added fancy stuff for initial 'release'