feature request #124
small bugfixes