Compare commits

...
A pull request between these branches already exists: Trivernis/helix-plus#6

WIP: Apply patches #6