Update examples
Update wiki link
Merged