bugfix && add placeholder
Merge pull request #8 from lykling/dev

bugfix && add placeholder