Resolves issue #13