Removed an unecessary conversion.
Resolves #5. Resolves #6.