Cleanup
Added travis support