Initial project version
second merge