Merge pull request #36 from elenasa/master

Catch up to upstream
Ulam tweaks
Add uc to generated test call
Merge pull request #15 from DaveAckley/master

catch up