Merge pull request #148 from FellowTraveler/develop

Had to add some #includes to make this build.