[SWITCHYARD-340] Merged pull request 156 from gnodet