Merge pull request #34 from kamihouse/master