Fix #21, clarify license to be Apache License all the way