added resampling
added resampling
Merge branch 'master' into marius_edits
Merge pull request #5 from miili/marius_edits

Marius edits