Changes-12/05
Merge branch master