Merge pull request #12 from irixxxx/master