Skip to content

Addresed comments

Addresed comments #378