implemented rule 16
Merge branch 'origin/master'

Conflicts:
	vindaloo/Machine.fs