More flexible UMD

Resolves gh-2
Resolves gh-4