Merge pull request #20 from bnrubin/master