Merge pull request #1 from smoya/master

First skeleton
New skeleton