Merge pull request #9 from He-Ro/master