tomaka Merge pull request #6 from tafia/skeleton …