Adjust/Fix application of Apache license /issue #168