Once I can figure out how to get Travis-CI to not segfault, I'll do this. Thanks @limhoff-r7