Merge pull request #22 from addisonbgross/max

Updates and fixes to Selector