Merge pull request #14 from rmoshier/callap

OMG WE HAVE PARTIALS
back to work
Merge branch 'master' into callap