fixes #125, fixes #124, fixes #123, fixes #122
fixes #61
merge