Merge pull request #2 from nickroxburgh/master

Small changes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
separated out loading; on same wavelength!
Merge pull request #1 from Robinlovelace/master

various updates - testing merge