updating for Mac-specific and Go 1.4