Merge pull request #24 from frgm/master