Add vendor support for placeholder
Improved vendor placeholder; added test cases
Merge pull request #199 from devmission/master

Add vendor support for placeholder