merged alexmgarcia pull request

Signed-off-by: Kyle Noland <kylenoland@gmail.com>