Merge pull request #8 from oostenveld/master

another attempt to merge the sourceparcellate changes into the blessed/release version