Merge pull request #22 from xeno-by/master

hackathon
Hackathon Apr 17, 2014
Add extra todos regarding placeholder validation
Merge pull request #23 from densh/hackathon/17-apr-2014

Hackathon Apr 17, 2014