Merge #194 by greg0ire