Merge pull request #1 from ceph/master

merge newest code