Implements review suggestions
travisplexer: pr-431-osx travis ci test