Added comments
Added tests with jukito