issue 12: curves were not set correctly
Merge branch 'master' into gh-pages
merging curve fixes