Commit some new features

some new features inside
Merge pull request #1 from Jay1/New-Features

Commit some new features