Merge pull request #582 from neheb/miax