Merge pull request #3 from moaa