#488 Added more examples
#488 Updated todo