Add more features
Merge pull request #8 from microtroll/master

Add more features