Merge pull request #7 from irixxxx/master