clock in the middle
changes
merge conflict
Merge pull request #267 from nens/fritz_clock

clock in the middle