Clean up for 0.10.0. Added different examples in sample