Fixed some bugs
Merge https://github.com/aman207/DonatorExpress