[➦] Merged changes.
[✔] Fixed #1.