Improve features for #1
Merge to fix a wrong commit message