Merge pull request #11 from haroldcarr/master

Added LIMIT handling.
constrained upper limits for wai and warp