Added support for maxwidth and maxheight.  Cleaned up some binaries that made it into the repo.