New travis tested pull request based on #16