Merge pull request #1 from sminster/master

Add missing include
Merge remote-tracking branch 'upstream2/master'
Merge https://github.com/sminster/csm
Merge pull request #2 from johnpdpkarp/master

Pull latest changes