tests working
new pull
Merge pull request #25 from s-loar/steve_fri

Steve fri