Issue #190: Update simple samples