Making it run in Ubuntu

You might want to test to make sure this still works in OS X before merging, but it seems like it should.