#US113 fixes and changes test
Merge pull request #3 from vargasreyesv-UCSF/dev

#US113 fixes and changes test