fix filesystem storage.
Merge branch '0.2'