Add Takana
Merge pull request #2877 from barnaby/master

Add Takana