Added 64 bit support

This PR is #10 + cleanup