First commit on alterations
Merge pull request #543 from rodrigopsasaki/admin-client

First commit on alterations