AndrewBrinker Major simplification
Latest commit c272e02 Nov 29, 2016