Merge of development, Travis Integration