merged latest master from Dustin

@dustin thanks!