resolved #7
merged