Added proportion argument
Merge branch 'master' of https://github.com/vdumoulin/research