fix some feature
add some features
fix merge conflict
Merge pull request #53 from dmitryshilin/fix_partials

Fix partials