Forked from version 0.9.0