Adds placeholder support
Merge pull request #18 from DZNLabs/master

Adds placeholder support