Resolves #57 Issue.

Just as discussed!