Merge pull request #3 from qos-ch/master