upgrade to 2.1.1, add Apache license