parameters file added to travis
parameters file added to travis
Merge remote-tracking branch 'origin/master'