Include necessary headers
Merge pull request #4 from sjackman/master

Include necessary headers