Merge pull request #88 from drobbs/master

Fixed the Editor-Only Code Bug