Updated for publishing
Updated license