Merging master to add-more-test to fix travis