Some Parts (may change in the future)
Merge pull request #3 from Ninja5tyl3/dev

Some Parts (may change in the future)