Credit fix
Merge pull request #7 from RainbowDashDC/dev

Syncing dev & master, stable.