First Commit
Merge https://github.com/Shadey/DollarsX