[issue #431] Get samples working