Update avi2014 and dis2014

Resolves #41 and #42.