fixing issues prior to publication
Merge pull request #1869 from tysonn/6-11

fixing issues prior to publication