Merge branch 'feature-#4-nice-usage'