0.3.2 N #8

- further prepare for offline
0.3.2N  #9