jamii Merge pull request witheve#187 from steveklabnik/fix_warnings