Merge pull request #81 from Cyan4973/dev

fixed minor conversion warnings