initial commit (modified file from salendron)