Updated for BuildMaster 4.0
Issue #1