wip: Untested feat

I'm an asshole dev that does not test his commits.
Merge pull request #1 from gfestari/test

wip: Untested feat