Made some changes, added travis