Updated features
Merge pull request #1 from Maxwll9/master

Updated features