jogu Merge pull request #388 from jweyrich/master

Enable a couple of warnings (related to #342)

9051a33