[TASK] Final changes

Resolves: #2
Releases: x