20130127
Merge remote-tracking branch 'origin/artpeace'