Added proportion argument
Merge branch 'master' of https://github.com/vdumoulin/research
Merge pull request #4 from jpraymond/master

Added proportion argument