Fixed issue #42 and other related items.