Merge pull request #1 from samercier/master

Okay derivatives added.
oops @samercier
oops me
fixing width
things
things
integrally things