fixes #20 - OMG. Finally conquered this bitch.  Worth it... I'm out.