Pipeline

Merging pipeline with master