Rewrote flag management.
this.data. fix
version bump
Merge branch 'release/0.3.6'