bugfixes
Merge pull request #52 from shackbarth/tutorial

bugfixes