Merge pull request #32 from flubbes/fabian

merge fabian into update-1
Merge branch 'update-1' into fabian