Added travis config + bugfix