Refactoring username to something reasonable
Merge branch 'refactor'