Fixed issue # 108 and 107