License changed to Apache License, Version 2.0
Various changes