removed example, robbert fucked up
Merge branch 'master' into traveller