Small features.
Merge pull request #8 from lambdaide/simple-features

Small features.