pull from david's repo

hi david!