Datawalk in a stable condition
Merge pull request #1046 from Rajia/master

Datawalk in a stable condition