updates and closes #255