initial commit
merged with github's master