1223
Merge pull request #19 from ChinaPicture/master

1223