Resolves #4 and Resolves #9 - Closes #7