merging in Nick's changes

Signed-off-by: ZackB <zack@irongatecreative.com>