eric/travis code review