Merge branch 'multprop' (resolving #9)