jack OP

- Addressed comments from pull request #113
- Adds re-sampling