Program changes 20140621

Tested 20140621