Better populating
Merge pull request #61 from conorfennell/master

Better populating