I98

these issues will follow: #102 #103