#627 reproduced
#627 fixed
#627 documented
#627 test fixed
#627 fix for mac
#627 test fix
#627 test fix
#627 polished