Resolves enhancement #1