Fixed tutorial gh-542
Merge remote-tracking branch 'origin/tutorial-fix'