initial commit
merging with github branch