Merge pull request #66 from coldfix/jpymad-only