Adding in changes from briandailey's PR

Signed-off-by: Jason Myers <jason@jasonamyers.com>