Issue 90

solve #90