Merge pull request #55 from elisha464/master

More fixes
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3