Minor changes
Minor changes (fixed #229)