Now it's a really skeleton.
Merge pull request #1 from gabrielsch/feature/cleanup

Now it's a really skeleton.