Add features
Merge pull request #2 from imtired2/master

Add features