Merge pull request #20 from nicklevine/master