[TASK] Merge Pull Request #41 manually

Resolves #41