initial project version
v1
fixed git conflict