#bugfix + licence corrections