Merge pull request #137 from bmarwell/tutorial

tutorial conversion.