Merge pull request #5 from jrah/master

Merge master into susy!
Merge pull request #6 from jrah/susygrid

Merge pull request #5 from jrah/master