Xs64bit ca142451 with unit tests

This is a pull request to test that the Unit tests will succeed.

This is a combination of #210 and #212

Github: closes #210
Github: closes #212