Resolves part of #52.