Possibly solves also #24.
Possibly solves also #24.