Closes #235. Code review