Merge pull request #1 from antirez/unstable