updates to linux gcc build errors
Merge pull request #87 from andrew-elder/master

updates to linux gcc build errors