initial commit
added types file
merged master