Merge pull request #517 from wmathurin/unstable23

Support for longs