Merge pull request #2 from EvertVP/development

Development
Merge branch 'development'
Made a difference between change names and switching users.