implemented #137 and #130