Update avi2014 and dis2014
Merge pull request #43 from jayfo/avi2014

Resolves #41 and #42.