4/24/2014 changes

the last changes
Merging Changes