Merge branch 'derivative-wrangler' into 'master'

Derivative wrangler

Closes #4 and #6

See merge request !20