Fixed #198 #199
Minor changes