Fixed compiler warnings related to implicit conversions.
Merge pull request #1009 from jparound30/fix-warnings

 Fixed compiler warnings related to implicit conversions.