Merge pull request #1 from blind675/master

Merge to development
Merge pull request #2 from blind675/master

Merge Master to bugFix branch
Branches merge
Merge branches 'bugFix', 'development' and 'master' of https://github.com/blind675/YourWorth into bugFix
Merge branch 'bugFix'
Work in progress.