More #147 changes

Signed-off-by: Mark Yasuda <yasuda@sipo.gess.ethz.ch>