Merge pull request #81 from jossgray/fix-warnings