More work on #137
Maybe travis will like this