Fixed Issue #160
Minor changes