Closes #235. Code review

#182 
:+1: