Clamping time
Merge branch 'master' of github.com:madlag/jarvis into develop