One more comment: don't forget the "Apache License" header...