merged with files from Eclipse project