Generated master for commit 7166521
Author: gidden <matthew.gidden@gmail.com>

    addressed @gonuke's comments