fixes #106 - also fixes the jshint errors from prior commit