Fixed sample
Merge branch 'develop'