Merge pull request #1 from manuel1369/nikola-changes

Nikola changes
Merge branch 'nikola-changes' of github.com:manuel1369/youshape into nikola-changes
following functionality