jianboqi Merge pull request #28 from Crghilardi/fix_warnings