started, but don't know the name for calc stuff
fixed #7
Merge branch 'master' into 7-derivative