Rollbacked version to 0.2.x for production use