Merge pull request #167 from masondesu/joe-fixes

Joe fixes
added 2014 events