tingelst/calibration — pull request #1 by oroulet (2013-08-30 09:31:47+00:00)
Title: merge dev branch

as agred