UPDATED: Eluna
Added int64 support