Maybe this?
I'll try to rebase once I get stupid Travis working