Merging changes between demo version and local version

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