Switched to Apache 2.0 Licence