Merge branch 'master' into ki_branch
Merge branch 'master' into ki_branch
Merge pull request #8 from kiwchang/ki_branch

Ki branch