issue #22
Merge pull request #39 from kinokino2010/issue22

issue #22