Fixed a couple of bugs.
Merge branch 'master' of https://github.com/danielelinaro/dynclamp