Frame update
Merge pull request #1164 from brooksryba/develop

Develop