closes #149, #145