Fixed issue #116 and the other related issues.