changes of June 15th 2013
Merge develop