Fix: issue37
master modified
merged