Merge pull request #114 from LandonVance/master

Visual rework