Merge "Improve documentation and use Long instead of 64Bits" into sc-dev