Finished working on bug #76.