added new files, resolved #3