Adding in float and double

Fixes #14
Fixes #15