integretated w/ v1.0.4; polished code