Issue 141

Close #141