Apache 2 License. more polish