Updated to v 0.82