Issue/273

woo fixes #273 
history is weird branched it before pulling, but that will resolve with merging, right?