Closes #54. Small changes