Merge pull request #616 from shamanas/master

Fixed a stupid typo
Merge pull request #617 from shamanas/master

The common root of an integer and a floating point type is now correctly the floating point type
Debug-- (woops)