Resolves issue 45.
Resolves issue 43.
Resolves issue 46.
Resolves issue #44.