closes #38
rebuilt