Updated tutorial reflecting issue #17 improvements