Already done it - see travis branch