Merge pull request #637 from joola/feature/#636

#636 comb over
#636 added examples.
Merge branch 'develop' into feature/#636