Closes #7
Minor corrections