Bristleback 0.3.0 dev

for code review and for merge with master