Merge pull request #1 from pastgift/dev

Dev Progress Merge
Merge pull request #2 from pastgift/dev

Dev Progress
Update README.md
Merge pull request #3 from pastgift/dev

Dev
Solve conflicts