Closes #13 Fixed minor issue