updated master

5-28-2014