Merge pull request #1 from modelglue/newScaffolding

catching up to remote
moving the trace inside the if statement.  Fixes #2
Merge pull request #3 from russ0519/newScaffolding

fixes #2