minor 2
Merge branch 'master' of https://github.com/tjbwyk/EC_VU_2014