Change in dev branch
Added two features