Multi subs support
Merge pull request #72 from jimdanz/multi-subs

Multi subs support