Add support for placeholder
Merge pull request #43 from jreyes/placeholder-support

Add support for placeholder