merge to pull on home mac

Signed-off-by: rich sollenne <rich@sollenne.com>