adding all the changes
Merge pull request #1 from negativetwelve/mark/new_feature

adding all the changes