Added travis testing fixes #1