Merge branch 'master' into algorithm
Merge pull request #23 from usunyu/algorithm

Merge branch 'master' into algorithm