push
Merge pull request #313 from rhsu/miscMasterCleanup

push
fixed up merge conflicts