Merge pull request #789 from brooksryba/develop

Develop
Fixed change cell function
Merge pull request #790 from ahomatthew/develop

Fixed change cell function
Added toggle function