Merge pull request #2 from ucsf-ckm/master

sync up