Merge pull request #1 from bloodyjoni/temp

git fin=xing tentative2