Merge pull request #30 from pausz/trunk

New tutorial