Fixing curve edition
Merge branch 'dev' of github.com:nicolashincker/i-score into dev