Initial commit
merge with kin9 branch