refactor.
Merge pull request #375 from forumbyr/master

refactor.