Conflict resolved #118 and #119