Merge pull request #13 from garethleonard/master

XSL Updates
matrices adding
Merge pull request #14 from jamesrohl/more_smoke

matrices adding
updates
further changes
updates to improve xsl stability