Updated #193 so it can be merged