Merge pull request #22 from alexander-zimmermann/master

1-way delay and improvements for heterogeneous measurement