merge in examples and issue 3 fix