new dev machins
boid
Merge origin/master