fixes 6
Merge pull request #1835 from tysonn/5-20-2014

fixes 6