I repeat: FUCK LAMBDA FUNCTIONS
Merge branch 'calc'