inital commit of new version
merged changes