Merge pull request #5 from jrah/master

Merge master into susy!