eliminate warnings
Merge pull request #1222 from igorko/master

eliminate warnings