Merge pull request #202 from ngoldman/master

Add support for properties, rateLimit, times