new changes 21042014
Merge remote-tracking branch 'origin/master'
new changes 23042014