Merge pull request #78 from davidvossel/master

fixes travis compile time issue