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

bugfix && add placeholder
Merge pull request #9 from fcfe/0.0.2-dev

0.0.2 dev