Merge pull request #25 from @bzed