Ref #16 - License adjustments