Moved samples, closes #52
Merge branch 'release-4.1.0' into develop