Merge pull request #5 from Tofee/work

Work
Merge pull request #6 from Tofee/work

Work
Merge pull request #7 from Tofee/automated-tests

Automated tests
Merge pull request #8 from Tofee/automated-tests

Automated tests