Merge pull request #2 from reicast/master

Re-cloned