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

fixes 5