Travis update

Fix #51
Fix #52