updated build to current master