Resolves #57 Issue.