A more functional sample, now via command line
Merge branch 'develop'