Projectkk2glider/remaining issues 1311

Consider this changes in relation to issue #1311
Yes you got it! Can you take care of it, it is a bit too much for me?

Here is what it looked like before my patch. Max values set:
![issue_d](https://cloud.githubusercontent.com/assets/5950438/3339044/e0a3096c-f864-11e3-8dc7-fa8dc01ec47c.png)