Changed conflicting license terms. Ref #75