Develop

Update #874 request, 
 comment and tests added, used develop branch