fixes 7
Merge pull request #1836 from tysonn/5-20-2014

fixes 7