Merge pull request #65 from coldfix/cpymad-only