jhollway Merge pull request #241 from snlab-ch/develop