refactor; upd to 0.0.6