ref: a515d590c97a2bc52e3b1b05a7cf056c97bea965
parent: 71cf6472c224f0f35ae78559d728ad221f164b65
author: James Haley <haleyjd@hotmail.com>
date: Sat Mar 5 20:22:27 EST 2016
Address multiple issues identified by nukeykt; partially resolves issue #663