Merge pull request #1 from bloodyjoni/temp

git fin=xing tentative
Merge pull request #2 from bloodyjoni/FIxing

Merge pull request #1 from bloodyjoni/temp