Closes #235. Code review

#182 
Remember about it.