Refactor a little bit
DERIVE to PRODUCTION
Merge pull request #3 from evansb/continue-expression

Continue expression