Updated with Apache 2.0 license
Updated