Update issue 153
Update issue 153
Update issue 156
Fixes issue 156
Update issue 113