Merge pull request #4 from CareTiger/dev-kanat