First commit
Merge https://github.com/Icett/emeWpisywacz