master

-updates for 4/28/14