Fix creating with a collection outro
Fix #66
Cleaner shortcode content
Merge remote-tracking branch 'origin/develop' into develop