manually merge pull request #95 / fixxes issue #23