Add simpler progn macro
Merge remote-tracking branch 'origin/sample-progn_macro' into develop