Adjusted limits logic; Added logging around limits to troubleshoot bug;
Merge pull request #82 from jfwood/0cc71d5d3148b9cdb29fc3cc596289055284aba8

Adjusted limits logic; Added logging around limits to troubleshoot bug;