initial commit
merged changes from initial on github