Merge pull request #22 from wsgac/master