Small change to makefile
Merge branch 'curves' into curves_powers

Conflicts:
	Makefile