working on differents tickets - closing #19 btw.