issue #6
issue#5
Merge pull request #7 from legokichi/issue#6

issue #6
Merge pull request #8 from legokichi/issue#5

issue#5