Merge pull request #116 from olerem/warnings-2016.11.26