add tags
changed to use playbook_dir
Merge branch 'release/1.0.5'