Separate definitions and declarations
Merge pull request #2 from cbarrett/cbarrett/definitions

Separate definitions and declarations