Internal changes suggested for release
Merge pull request #1 from ironfroggy/develop

Internal changes suggested for release