Merge pull request #217 from agtorre/2.4dev

cleaned up 2 warnings