Merge pull request #657 from linuxmaniac/vseva/fix_warnings