Take part of the changes in
Remove warning
Fix rest of code
Review comments
Merge pull request #545 from twitter/release/0.5.2rc2

Release/0.5.2rc2