Copyright upgraded, fix #5