resolve bug #86 #92

Closed kristiankacinetz closed 7 years ago