Merge pull request #15 from peastman/master

Improved error checking
Merge pull request #17 from peastman/master

Bug fix to Modeller