Resolves issue 45.
Resolves issue 43.