Fixed wanderer.
Merge branch 'mt-0.9.0'