Merge pull request #565 from martypdx/reassign-2

Merge reassign and jshint fix