First user is now the owner of the system. Removed some trim on numbers.
Merge origin/master