Initial commit after licensing modification.
Update licence to Apache V2 + minors fixes