Merge pull request #2 from ZomgPonies/master

Downstream update
Fixes a minor bug with pipe laying
Merge pull request #403 from Bone-White/master

Fixes a minor bug with pipe laying