Close issues #118 and #119