fixed wiki link
add example
Merge branches 'master' and 'changes'