Fixed #68 and fixed #56.