Bristleback 0.3.0 issue 16

for code review