fixes 3
Merge pull request #1831 from tysonn/5-20-2014

fixes 3