Closes #235. Code review

#182 
Do you use it anywhere?