upped version num
Merge remote branch 'ethan/master' into wagn_master