Added placeholder functionality.
Added test for placeholder.
Merge pull request #1 from robgietema/master

Added placeholder functionality