#244
Merge pull request #254 from rhsu/bug244v2

#244
Merge branch 'master' into unitTestFixup229