Added work flow hints
improved according to review
Improved according to review
Merge branch 'review_141002_workflow_hints'

Conflicts:
	lib/machinery.rb