issue
merged bug fix 101