Issue #94 - with sample scripts