Merge pull request #22 from wbprice/master

quick stash