Sisso

Travis problem fixed, forgot to pull from develop