Fixes #10
Merge branch 'dev'

Conflicts:
	app/controllers/calculations_controller.rb