closes #37; limit now added