Update issue 104
Update issue 106