Feature/travis

Should fix #2