issue #19, update samples