Pull request from night 15.

09.2014.

Global changes with math.