Merge pull request #518 from wmathurin/unstable

Handling of longs / doubles