Merge pull request #37 from arolan/feature/settings

implemented user name and refactored code