refactoring and updates for travis #014