Merging to Apache License v2