add switch option to use machine tag
Merge pull request #119 from furushchev/add-option-use-machine-tag

add switch option to use machine tag