Merge pull request #78 from jchodera/master

Debugged systembuilder.