Merge pull request #1 from trylimits/master

Pulling in the latest changes