'little_fixes'
Merge remote-tracking branch 'upstream/umass_branch' into umass_branch
Merge pull request #176 from kevb0001/umass_branch

Little Fixes