iteration4-2

Merge pull request #48 from mikehuston/iter-4-updates

Iter 4 updates

iteration4-1

Merge branch 'iter4' of https://github.com/mikehuston/saffron-strand …

…into iter4