pledge-day-2014 fixes
Merge pull request #84 from fantgeass/master

pledge-day-2014 fixes