Backport and tweaks
Hint and cleanup
0.3.0