Minor modification for licence and naming