my first commit
merged with origina