Merge pull request #913 from ahomatthew/develop

Develop
Tab bug fix