Added fix for #60 and #61.