** Review changes
** Changed version into 2.0.0