Merge pull request #1 from Tofee/work

Work
Merge pull request #2 from Tofee/work

Work
Merge pull request #3 from Tofee/work

Work