Multiple measure paths

merging in changes for release 0.3.6