Quarterly bug fixes
Merge branch 'master' of github.com:grantmcwilliams/ClassStack