resolves #29
resolves #40. resolves #29