oh noes!  my pull req #2 makes changes to this.  can we merge/approve it so we can get it in?