#59 fixed features conflict
Merge branch '59_task' into testing