Latest commit d96a009 Oct 29, 2015 hlandau Tweaks