backup
Merge pull request #251 from rhsu/maintenance

backup
Merge branch 'master' into unitTestFixup229